From 5d9a26c7753f68b94565584f1fe66740aad0a7dd Mon Sep 17 00:00:00 2001 From: Johan Dahlin Date: Fri, 15 Jun 2007 19:21:43 +0000 Subject: [PATCH] Use gsize instead of unsigned and gulong instead of long, fixes complation * gtk/gtkbuilder.c (gtk_builder_add_from_file): (gtk_builder_value_from_string_type): Use gsize instead of unsigned and gulong instead of long, fixes complation on OSX, fixes #447987 svn path=/trunk/; revision=18146 --- ChangeLog | 7 +++++++ gtk/gtkbuilder.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dba5a61bc..6b5519ced1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-06-15 Johan Dahlin + + * gtk/gtkbuilder.c (gtk_builder_add_from_file): + (gtk_builder_value_from_string_type): + Use gsize instead of unsigned and gulong instead of long, + fixes complation on OSX, fixes #447987 + 2007-06-15 Matthias Clasen * gtk/gtkmenushell.[ch]: add move_selected signal to allow diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c index a4017c3ce4..63b2f09a28 100644 --- a/gtk/gtkbuilder.c +++ b/gtk/gtkbuilder.c @@ -600,7 +600,7 @@ gtk_builder_add_from_file (GtkBuilder *builder, GError **error) { char *buffer; - unsigned length; + gsize length; GError *tmp_error; g_return_val_if_fail (GTK_IS_BUILDER (builder), 0); @@ -1020,7 +1020,7 @@ gtk_builder_value_from_string_type (GType type, case G_TYPE_UINT: case G_TYPE_ULONG: { - ulong ul; + gulong ul; errno = 0; ul = strtoul (string, NULL, 0); if (errno) -- 2.30.2